Merge from source.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 20 Sep 2011 20:57:57 +0000 (13:57 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 20 Sep 2011 20:57:57 +0000 (13:57 -0700)

Trivial merge